catch cmake up (#666)

with recent changes to *.pro files, and
some lost changes to get windows rc files working.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b2ec2c6c41762b5b6156ca61dbdaf98ba42b939..66dd328f4ef4a864419c8da2114693c2c77a9dac 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -227,12 +227,12 @@ if(WIN32)
   set(HEADERS ${HEADERS} gbser_win.h)
   set(JEEPS ${JEEPS} jeeps/gpsusbwin.cc)
   set(LIBS ${LIBS} setupapi)
-  set(RC_FILE win32/gpsbabel.rc)
+  set(RESOURCES ${RESOURCES} win32/gpsbabel.rc)
 endif()
 
 if(MSVC)
   add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
-  add_compile_options(/MP -wd4100)
+  add_compile_options(/MP -wd4100 -wd4267)
 endif()
 
 if (UNIX AND NOT APPLE)
@@ -267,7 +267,7 @@ if (APPLE)
 endif()
 
 set(SOURCES
-  ${SOURCES} ${ALL_FMTS} ${FILTERS} ${SUPPORT} ${SHAPE} ${ZLIB} ${JEEPS}
+  ${SOURCES} ${ALL_FMTS} ${FILTERS} ${SUPPORT} ${SHAPE} ${ZLIB} ${JEEPS} ${RESOURCES}
 )
 
 # We don't care about stripping things out of the build.  Full monty, baby.

diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 6f62f7eceda9788f99076c5099e950d9b9c75886..fd91b82f24d383bbe52af99bbd03687b57dd098f 100644 (file)
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -65,7 +65,7 @@ endif()
 set(RESOURCES app.qrc)
 
 if (WIN32)
-  set(RC_FILE app.rc)
+  set(RESOURCES ${RESOURCES} app.rc)
 endif()
 
 if (UNIX AND NOT APPLE)